From fe746c26c0d23c61dbc7eb1918addb1c9a3729bf Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Fri, 27 Mar 2020 12:49:47 +0100 Subject: [PATCH] automation/gitlab: add https transport support to Debian images MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The LLVM repos have switched from http to https, and trying to access using http will get redirected to https. Add the apt-transport-https package to the x86 Debian containers that use the LLVM repos, in order to support the https transport method. Note that on Arm we only test with gcc, so don't add the package for the Debian Arm container. This fixes the following error seen on the QEMU smoke tests: E: The method driver /usr/lib/apt/methods/https could not be found. Signed-off-by: Roger Pau Monné Acked-by: Wei Liu --- automation/build/debian/stretch-i386.dockerfile | 1 + automation/build/debian/stretch.dockerfile | 1 + automation/build/debian/unstable-i386.dockerfile | 1 + automation/build/debian/unstable.dockerfile | 1 + 4 files changed, 4 insertions(+) diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile index 4797ae3442..7b6f8eff69 100644 --- a/automation/build/debian/stretch-i386.dockerfile +++ b/automation/build/debian/stretch-i386.dockerfile @@ -45,6 +45,7 @@ RUN apt-get update && \ wget \ git \ nasm \ + apt-transport-https \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile index cfbb2e9b0b..32742f7f39 100644 --- a/automation/build/debian/stretch.dockerfile +++ b/automation/build/debian/stretch.dockerfile @@ -44,6 +44,7 @@ RUN apt-get update && \ git \ nasm \ gnupg \ + apt-transport-https \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/build/debian/unstable-i386.dockerfile b/automation/build/debian/unstable-i386.dockerfile index 1a73b3b1ec..86ff3585df 100644 --- a/automation/build/debian/unstable-i386.dockerfile +++ b/automation/build/debian/unstable-i386.dockerfile @@ -45,6 +45,7 @@ RUN apt-get update && \ wget \ git \ nasm \ + apt-transport-https \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/build/debian/unstable.dockerfile b/automation/build/debian/unstable.dockerfile index 2a834f6719..d0aa5ad2bb 100644 --- a/automation/build/debian/unstable.dockerfile +++ b/automation/build/debian/unstable.dockerfile @@ -44,6 +44,7 @@ RUN apt-get update && \ git \ nasm \ gnupg \ + apt-transport-https \ && \ apt-get autoremove -y && \ apt-get clean && \ -- 2.30.2